From: Thomas Gleixner Date: Thu, 27 Aug 2009 14:42:07 +0000 (+0200) Subject: Merge branch 'x86/paravirt' into x86/cleanups X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~21298^2~39 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6effcd92454ca5d7021b74f89fcac75209e146f9;p=linux-4.9.git Merge branch 'x86/paravirt' into x86/cleanups Reason: The setup cleanups conflict with the paravirt cleanups. Avoid a rather large merge conflict Signed-off-by: Thomas Gleixner --- 6effcd92454ca5d7021b74f89fcac75209e146f9